merge from open-source master

Change-Id: If11068b7126ca670d32a4823252876836f336835
tree: d862f8a72acac4c2238689e8e2e8c9cca9349113
  1. original/
  2. CleanSpec.mk