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

Change-Id: I5547f465814d5cd3dca05e0a4c8e0f2473febc75