ANDROID: update patch stack

Two patches from the patch stack were accepted upstream and included in
4.15. Two new patches were required to get 4.15 to compile and run on
Android.

Change-Id: I1a81cf0c130818aaeced036311d3aaa9daf752eb
Signed-off-by: Steve Muckle <smuckle@google.com>
4 files changed