Merge tag 'android-4.3_r2.2' of https://android.googlesource.com/platform/build into cm-10.2