Merged changes from CM to fix build for Android 4.2.2