Android CTS 6.0 Release 21 (4214424)
Merge "Add NOTICE and MODULE_LICENSE files"