Use the new more inclusive command-line options.

Test: Compile
Change-Id: If0a5a6c20b72034e15ebca2ced6a9394f007a12d
2 files changed