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

Change-Id: If3bce2d3050ffc472ff0df43d64670244eb7ee5e