Merge "Revert "PMSCompilerMapping: Hardcode a value for pm.dexopt.shared"" am: f597ad51 am: 41c52377 am: 1fb4c9a4 Change-Id: If003333607b55f06bc6e2324464bf2195861278d