Merge tag 'android-4.3_r2.1' into cm-10.2

Android 4.3 release 2.1
QuickSearchBox: UG translation, added Uyghur translation.

Change-Id: I2f6765bf204525beaed15e9b37132a5da2ae3bf3
Revert "Issue 6501: "Search" application stops when entering its settings"

This reverts commit c52cdc16691a174db077712334cc8cf7334e9312.
Merge tag 'android-4.4_r1' into cm-11.0

Android 4.4 Release 1.0
Merge remote-tracking branch 'cm/cm-11.0' into HEAD