am 9e3bc3f6: Merge "Build overlay packages just like regular packages."

* commit '9e3bc3f61df541271c8a1dfc5564cab853951aec':
  Build overlay packages just like regular packages.