Android CTS 6.0 Release 4
Merge "Add MODULE_LICENSE and NOTICE files"