Merge "android: use new platform & non-platform property contexts."
am: df462c8932

Change-Id: I10c0f6be8e3561a056470c4ee1f08424ba13801e