Decrease NUMBEROFFILES.

Core patch 7db55341791cb44ca599b84bea707b05de2f227d added two files.
It was reverted in 4ba7a9c102cdacf4f9930960299aa8f354fdd680, so reduce
NUMBEROFFILES by two.

This reverts commit 730e4e02d30c20f980eee68f1b59f29c0405113b.

Change-Id: I2af1d9ac000bd16d86a2e448a5e154bf5de7581e
Merge "Decrease NUMBEROFFILES."