Merge tag 'android-5.0.0_r2' into HEAD

Android 5.0.0 release 2
Merge branch 'cm' into HEAD