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

Change-Id: I97b6bbce9a969f06b923bebd60ccf9a5dee91e9e