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

Change-Id: I3ed04e8f1fabde08ef5704a999c3d681fbf2027b