Android 6.0.1 Release 51 (MOB30Q)
Merge "host modules don't need LOCAL_MODULE_TAGS"