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

Change-Id: I3aa63a00fa1b7c4da77405de670c0531e66f4c02