Merge tag 'android-5.1.0_r3' of https://android.googlesource.com/platform/development into HEAD

Android 5.1.0 release 3