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

Change-Id: I2cc31e39a985770278460f1695593523216846b1