Merge "SettingsLib: Build with AAPT2" into nyc-dev