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

Change-Id: I54911482e35a5e3c1b6c3c62133324e7aa71fa49