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

Change-Id: I7cc9deb80122ca587d5c711fd84ad8c217aaa438