Android O IOT Preview 7 (4635859)
Merge "Fix link-type check warning on org.apache.http.legacy.boot"