Merge "Allow adbd to set/get persist.adb props, system_server to get."