Android CTS 5.1 release 6
merge in lmp-mr1-release history after reset to lmp-mr1-dev