Revert "android: use new platform & non-platform property contexts."
am: 9abe34200e

Change-Id: Ia2d387f84be62294d6737fc67aa602744f9f98d2