Merge tag 'android-4.3_r3' into HEAD

Android 4.3 release 3.0

(cherry picked from commit a9318331cce946f4a061745c620ac78d862521c2)

Conflicts:
	include/private/android_filesystem_config.h
orig file
Revert "orig file"

This reverts commit 109d97dfda9d772f376cd7ff6fd67c1974ed289e.