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

Change-Id: I75ed595383ed9c237e2b61086e4cd36c8cb60cb8