Android Lego 6.0.1 release 1 (M3D04C)
Merge "host modules don't need LOCAL_MODULE_TAGS"