android: use new platform & non-platform service contexts. am: 2ca78856e7 am: 34066dcf9d
am: 1b6bc2d09a

Change-Id: I1d216d6105409c2b159e4dd1b2d16086d1579c93