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

Change-Id: Id05d1cd2d9cb6bd1b9d80b2128b45c4a411951a3