Merge "Build split file_contexts."
am: 80e70ae04a

Change-Id: I2445d8e3e5f205cf3761fcf1ea12af007bbed0d9