Merge "Move secondary dex files processing in the app process" am: 01d0be16bd am: cd3040df6f
am: 273b88165c  -s ours

Change-Id: Id99c8e39e2c2b552c2c749450ba6675b3db4b011