Android 6.0.1 Release 54 (MTC19Z)
Merge "host modules don't need LOCAL_MODULE_TAGS"