Android CTS 5.1 Release 21 (4114473)
merge in lmp-mr1-release history after reset to lmp-mr1-dev