Flat merge of android-4.3_r2.1 to cm-10.2 branch