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