Android CTS 7.1 Release 6 (4009365)
Merge "DO NOT MERGE ANYWHERE Upgrade 3.10 ranchu kernels to 1936fdf" into nyc-mr1-dev