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

Change-Id: Ib68850fd7014377d15614bacfe88a7ea0e0b8944