am fe685787: Merge "Fix userdebug build."

* commit 'fe68578716290d93fd42005622adade8d345de3c':
  Fix userdebug build.