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

Change-Id: If4954cd3058264492cf9e84f898b928da39c6fd4