Merge "getprop: add -T option to return a property's type"