Merge "Remove obsolete DEXOPT_SAFEMODE."
am: 4fa2b96d21

Change-Id: I652a433fb0e042b79e4289faf74b8b4c6cd84f91