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

Change-Id: Iaaa300cfb631a6673c53c1b590a61a7a0e541e96