Android 7.1.1 release 2
DO NOT MERGE: Add a few more no-op stubs for cURL compatibility. am: 4177c9b481
am: 1220bf946d

Change-Id: I9add2c54dda8093efd7b3df79aef436bcaf2ddd7