Android 5.1.1 release 25
Merge "host modules don't need LOCAL_MODULE_TAGS"