Bump plugin api and sort.

Change-Id: I8b8ab58abbd40726326b8b47bd6bbb07580b5ce4
2 files changed