Android 6.0.1 Release 60 (MOB30Y)
Merge "host modules don't need LOCAL_MODULE_TAGS"