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

Change-Id: Id98628750e3e14418aba005f1bb534fdf012f975