Android 6.0.1 Release 49 (MOB30O)
Merge "host modules don't need LOCAL_MODULE_TAGS"