am 4f84888a: Merge "Temporary workaround build system issues."

* commit '4f84888a47efdb9d8f4b08216cbd0f7bb7887247':
  Temporary workaround build system issues.