Android 5.0.0 release 4
Merge "host modules don't need LOCAL_MODULE_TAGS"