Merge changes I07e90850,Ie12b3e42

* changes:
  AAPT2: Set compatible-screens in manifest for multi-APK
  AAPT2: Update versionCode in multi-APKs.