Merge preprocessor test changes from f84ef70bc729506184b052e5e9cf78796a5a4704 Change-Id: I672f8b37f1e8189e43273abb59bce23ff1d580c1 Reviewed-on: https://chromium-review.googlesource.com/178994 Reviewed-by: Nicolas Capens <nicolascapens@chromium.org> Commit-Queue: Nicolas Capens <nicolascapens@chromium.org> Tested-by: Nicolas Capens <nicolascapens@chromium.org>