Merge "Switch adb to <android-base/properties.h>." am: d9a23b5733 am: 5dc7e6a79a am: 8b7751d360
am: 9daaf229d0

Change-Id: I994a43f1a4b3554b83451fa73b4826cf1acaede5