add getprop

Change-Id: Id7a87626d2351d49750e9982d6f81d2646d9d36d
Merge branch 'vendor-cm-cm-10.1' into cm-10.1-v6.0

Conflicts:
	Android.mk
remove old getprop