tree 8aaf7f52792a6917e40a5785e7b42a7975761876
parent caddad11f693be8e0fc1957665163641a4957326
parent aeace3fce9c0169350c0039c2623878c4ad0232a
author Guang Zhu <guangzhu@google.com> 1496422418 +0000
committer android-build-merger <android-build-merger@google.com> 1496422418 +0000

Merge "Update configurations to avoid using ApkInstaller" into oc-dev
am: aeace3fce9

Change-Id: Ie26c681cc30a16030ed27ae662d0fac8ede1cdbc