Merge omnirom:android-4.4 into AOSCP:android-4.4