Merge "Regenerate R.java files from LOCAL_STATIC_ANDROID_LIBRARIES"
am: b0d0ca38cc

Change-Id: Ibb10bf34960329a888991f1336d3a6cf145f8eac