Merge "PMSCompilerMapping: Hardcode a value for pm.dexopt.inactive" am: dc616ab11c am: cfb01b3f3f
am: 7dc51259cd

Change-Id: Ie72e549707b50d2b9b419e6fc2fbc82301ad3805