Merge remote-tracking branch 'CyanogenMod/android_build'