Use the new more inclusive command-line options.

Test: Compile
Change-Id: I9443541a912a0e9e718650a2349ba540f3f04958
5 files changed