Merge "Merge "Add build number to apps\' version name for non-platform build" into nyc-dev am: 1059f37377 am: eaa4ef4cfc" into nyc-mr1-dev-plus-aosp
am: 8a3f292c92

* commit '8a3f292c923ca46fd0a8197f620f2df5ce5271a4':

Change-Id: I85335d7d71f10044b99ce493eb8cb755bff63d5a