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

Change-Id: I268be60fe03c655a9aef9384cd56c820964097e0