Merge "Add android-5.10 support for S"