Merge "PMSCompilerMapping: Hardcode a value for pm.dexopt.shared" am: eb3bff53f6
am: 6f8a3cee0e

Change-Id: Ic2399e02d2102f984defb92c29b3568b94ebb244