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

Change-Id: Icb3e0820ebbaad36f3a16bf2353fb581ba5ecf50
tree: c3febd7e94caccfc7796519ce26af0162c9f412c
  1. tests/