Merge "Revert "Remove obsolete LOCAL_DX_FLAGS."" am: f1c766df21
am: 7a4cb6f631

Change-Id: I7f193b5d024f85ffe98d5b6cce19033552eeab6f