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

Change-Id: I1855d536c89d9548eb595001de6ff4d41b82d52b