Merge changes Iee2d74a3,Ib2298818

* changes:
  Installd: Add presubmit TEST_MAPPING
  Installd: Refactor installd_dexopt_test a bit