Merge "Remove obsolete DEXOPT_SAFEMODE." am: 4fa2b96d21
am: d1058fb90c

Change-Id: Ic9dd064d8eb66f1dd99302c0cfed83a5e4ca2233