Android 6.0.1 Release 58 (MOB30W)
Merge "host modules don't need LOCAL_MODULE_TAGS"