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

Change-Id: I63b249b87dd4467719ae9576c4a1bf3fc8666a21