Merge tag 'android-5.0.1_r1' into HEAD

Android 5.0.1 release 1

Change-Id: I855d555cdeedfdd85e8fa0718f4004cc2e2a09a1