Merge "Build split file_contexts." am: 80e70ae04a
am: dc9771e24c

Change-Id: Iff2afa4574052a4580739ce04904401334d1c270