Android CTS 6.0 release 6
merge in mnc-release history after reset to mnc-dev