am d9142243: am f2d3d657: Fix supportlib build

* commit 'd914224314c3056eb06b62d0ab18191b1f60477a':
  Fix supportlib build