Fixes: Build issues and updates dependencies#43

AjeshRPai merged 3 commits into

mainandroid/codelab-android-performance:mainfrom

bugfix/update-build-filesandroid/codelab-android-performance:bugfix/update-build-filesCopy head branch name to clipboard