Merge "Revert "PMSCompilerMapping: Hardcode a value for pm.dexopt.shared"" am: f597ad5106
am: 41c52377ed

Change-Id: I9058f70565327fe772b966a2fc3d55f187e267a2