Android 5.1.1 release 13
merge in lmp-mr1-nova-release history after reset to lmp-mr1-dev