Merge "Support LOCAL_STATIC_JAVA_AAR_LIBRARIES with aapt2"