Revert "Stop building getprop" am: 9810b2abf3
am: 850204ccee

Change-Id: Ieb821aceb39d0492e8d27eaae8b68abc1f85a781