Merge "Remove obsolete DEXOPT_SAFEMODE." am: 383b2af3ec am: 10085b3737 am: 4e3f529c6d
am: cb42fae8a3

Change-Id: I4083b5850f3a838f831c09daf7084bf4ab105732