Merge "Build split file_contexts on TREBLE builds"
am: 2d03e64b95

Change-Id: I76eacc102235ba5b989a15f678c8ecbf5b744ff8