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

Android 16.0.0 release 4

Change-Id: I0a4c0cf120fca05a888862b071ae293b0afd2a25