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