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

Change-Id: I0a687e8715370736cf01b955d95d282006452bbc