Merge "Fix warning with AAPT2 and LOCAL_STATIC_ANDROID_LIBRARIES"