Use the new more inclusive command-line options.

Test: Compile
Change-Id: I574334b0c12759774b2d8c1671eb4ebc25d160b5
1 file changed