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

Change-Id: Iaf77e3752a15d1965aa572c79816766c6b142fb8