Merge "Remove obsolete LOCAL_DX_FLAGS." am: eede886
am: e565277

* commit 'e565277b5b7529870b9e20c09009c0df3c01a922':
  Remove obsolete LOCAL_DX_FLAGS.

Change-Id: I1d10c6d3bb7748412dd683707d1cc2b192564d11