fix build
am: d5d60f642d  -s ours

Change-Id: I91bd0f8f8ef20db89096bb8fd840ae7c530220a4