Merge "Build SystemUI and Keyguard with AAPT2"