Merge "cppreopts: remove DAC capabilities" am: f7d22c0919
am: 5cef3f8263

Change-Id: I8bcb4597e2debc9f7fb2ae7092d12ec3f5684d0b