Use the new more inclusive command-line options.

Test: Compile
Change-Id: Ie54fb0dafda0a6167e95b32d0a6b4f762162ae1d
1 file changed