Merge tag 'android-4.3_r3' of https://android.googlesource.com/platform/build into HEAD

Android 4.3 release 3.0

Conflicts:
	core/build_id.mk
Merge branch 'flo' of https://github.com/PSX-PureSpeed/android_build into HEAD

Conflicts:
	core/build_id.mk