Merge "Refactor system properties protos to just include the list treble team defines http://go/treble-sysprop-compatibility."