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

Change-Id: Ief12a7e76bce51cf77ccb1b9becd1e3202325e4a