Merge "Revert "Remove obsolete LOCAL_DX_FLAGS.""