ANDROID: update patch stack

Ten Android-specific changes were merged and did not get copied into the
Android patch stack. Add these patches.

Also remove changes in patches 1 and 2 which affect files outside of
tools/testing/selftests since those changes do not need to be reapplied
during the upgrade process.

Change-Id: I0fdbe3fe18c06c2af637c3d584b829d96fb0fe63
Signed-off-by: Steve Muckle <smuckle@google.com>