m8: Reduce number of prop files

Change-Id: I5a8b53b38a5509bf1f6c6adc7f9d29970304b7a0