Android Lego 6.0.1 release 2 (M3D11B)
Merge "host modules don't need LOCAL_MODULE_TAGS"