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