Android 6.0.1 Release 48 (MMB30M)
Merge "host modules don't need LOCAL_MODULE_TAGS"