Merge "Schematize ADB system properties" into stage-aosp-master