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

Change-Id: I3a378b1d5b17f0278ab4fd02940c2ebd35065032