Merge "Calls aapt2 when a static Java library has...
Merge "Calls aapt2 when a static Java library has LOCAL_STATIC_ANDROID_LIBRARIES" into nyc-dev am: 2a7af11a
am: 9802ee73
* commit '9802ee73':
Calls aapt2 when a static Java library has LOCAL_STATIC_ANDROID_LIBRARIES