Move non-treble devices to split file_contexts am: e3363ccfba
am: 63b169b3d9

Change-Id: Ib361ce49044b2345e536703b20a0c8e3237beeb6