Merge "Move toString() methods to android::hardware"