Android CTS 8.0 Release 21 (5933210)
merge in oc-release history after reset to master