Android 6.0.1 Release 47 (MMB30K)
Merge "host modules don't need LOCAL_MODULE_TAGS"