Android CTS 6.0 release 6
Merge "Add new generated file."