Merge "Fix libminijail static build."
am: 4c0e630787

* commit '4c0e6307875b9d278cf5e94baa3217ce1ce9dadf':
  Fix libminijail static build.