Merge tag 'android-5.0.2_r1' into legacy

Android 5.0.2 release 1
Merge branch 'legacy' of https://github.com/VentureROM-L/android_build into legacy