Merge tag 'android-5.0.1_r1' into lollipop

Android 5.0.1 release 1
Merge branch 'lollipop' of https://github.com/nerull7/android_frameworks_base into HEAD