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

Change-Id: I47bbacb0ec51eb10e6f2af7db72df3ac193332bd