Merge "Switch adb to <android-base/properties.h>."