Update trampolines to be in sync with jsons

This change does not do anything functionally but is
needed so that next changes are more clean.

Bug: n/a
Test: builds
Change-Id: I252056e30ca2be793612edbc75c828d918da83e2
12 files changed