Merge "Revert "PMSCompilerMapping: Hardcode a value for pm.dexopt.inactive"" am: 08efd36872
am: 8249a5d677

Change-Id: I28aa38d66ab9c59c269157aff71edec5bd440942