am 7472788a: merge from open-source master

Merge commit '7472788a87f8cc758cd534d960d178a1481c4cfb'

* commit '7472788a87f8cc758cd534d960d178a1481c4cfb':
  Text specifies "android:codeName" which doesnt exist, should be "android:versionName"