tree 5f09205ec053763024e2f65d19f741d8391ac307
parent 290bb429d2765b77ed82e5589932d18abbf88abf
author Edwin Kempin <ekempin@google.com> 1565077426 +0200
committer Edwin Kempin <ekempin@google.com> 1565077426 +0200

Fix build

Some of the modifications that were done by change I9b8bba50d to adapt
the plugin to change I1dd37821a in core only work when change I1dd37821a
is submitted. Revert these modifications. As follow-up then redo them
and submit them together with change I1dd37821a.

Signed-off-by: Edwin Kempin <ekempin@google.com>
Change-Id: Ice3ec65af6f382750240fb64305b3330ac7df851