Android 5.0.0 release 5.1
merge in lmp-release history after reset to da5fcd2f0a7dddd67066a6b4b3e097fb96308e15