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

Change-Id: I69346b88c5ae62d4e520de25334fe9056a817994