Use the new more inclusive command-line options.

Test: Compile
Change-Id: I31a33d5432470fb57edc17751536fe1ae98e6838
1 file changed