Merge changes from topic "V"

* changes:
  Add VanillaIceCream to android.os.Build
  Add VanillaIceCream to aapt2 codenames