Move non-treble devices to split file_contexts am: f965a0a176
am: 2703f3eee8

Change-Id: I2130641f315522740c150f4a22f8a4fe20a9a085