Android 6.0.1 release 25 (MTC19T)
Merge "host modules don't need LOCAL_MODULE_TAGS"