Merge "BGDexopt: Have a single run for primary and secondary dexes" am: 39673f91fa am: 181177d87d
am: 454f7b59c5

Change-Id: Ib0aa318eef22dd93ea4d7c8e7f06ffbad692d709