android: use new platform & non-platform property contexts. am: 644cca6be8 am: 19aca7daa3
am: 422f20f4a0

Change-Id: I69389d463699db53e05fd196734238e55216f41e