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

Change-Id: I72996355a0b77ac3b40361d214b7ce9b4f3778b4