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