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

Change-Id: If98007a52a931cbd2d2800e94e02a1b4ecd32f08