Remove old "platform" namespace name in a few remaining places.
am: f0e99bd50f

Change-Id: Icece65f965d1e22f6d352cbeca819d2601d5bb24