Merge tag 'android-5.0.1_r1' into HEAD
Android 5.0.1 release 1

Change-Id: I5676c61ed611ba91ab8ae15d2e2427f1a589fc1f