am c6a2fb9e: Revert "Revert "fix the compilation error in broadcom partner branch""

* commit 'c6a2fb9e324208a48173877c70b13f2f1b01286e':
  Revert "Revert "fix the compilation error in broadcom partner branch""