Merge tag 'android-5.0.0_r2' into cm-12.0

Android 5.0.0 release 2

Change-Id: Ib84695d1ba6fbda12332c29c7bc6a74bec6c0986