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

Android 4.3 release 2.2

Plus add some more CM repos

Change-Id: I2b2590f5b33b5fb8822887baa641dc7faa0fcdca