Merge "LOCAL_AAPT_INCLUDE_ALL_RESOURCES"