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

Android 4.3 release 3.0
Explicitly add the theme manager's AID to fs config

SELinux failed to set the theme manager's context since the
app has a fixed non-user ID, and it didn't map to a pseudo-username.

Change-Id: I287dc0dd02abc164fe22e14c9f3f505c3dcb938d

Conflicts:
	include/private/android_filesystem_config.h