Android 5.0.2 release 1
Merge "host modules don't need LOCAL_MODULE_TAGS"