Move non-treble devices to split file_contexts am: 6ef44cbece am: fc9e362950  -s ours
am: 1bb007c5ec  -s ours

Change-Id: Ia10d36d3679ae5641eb09de7e9e39a066e74940e