Android 6.0.0 release 2
merge in mnc-release history after reset to mnc-dev