Merge android 4.3.1_r1 into AoCP.