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

Change-Id: Ia62229843dfa0d1ef176f7adc9138f481f3d8cf7