android: use new platform & non-platform property contexts.
am: 644cca6be8

Change-Id: I736b709d8bc7cf7e97f9fca9cd5977633a2eccec