Add android-5.10 support for S

Bug: 175707513
Change-Id: I6799b4ba3dad9b4ae6d8fe2646a2f07d24310537
1 file changed