Merge tag 'android-5.0.1_r1' into HEAD

Android 5.0.1 release 1

Change-Id: I827c85c98101f3abb24438877a4986e6241d3e94