Android 6.0.1 Release 80 (MOB31Z)
Merge "host modules don't need LOCAL_MODULE_TAGS"