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

Change-Id: I057e48074ec5dbdc6f05df487771375d392ee77d