Merge tag 'android-security-16.0.0_r3' into 16.1

Android security 16.0.0 release 3

Change-Id: If71f65af0da441357a01a08c49c9e8c6c5b1ee82