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

* commit '428bfa942e2df5cf1a35ecbcdb6c2290c0a3ced4':
  Remove obsolete LOCAL_DX_FLAGS.

Change-Id: I4416c0be2eb5673574bb1eb4eb7037c11b4570b8