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

Change-Id: Ifdd959ac5a8a9eaa2e73e7ec098d1229dd8f8a97