merge from open-source master

Change-Id: Iaa0381128dbfcbb6b7c7da072f0d78f02357fca9
tree: 6fe9f4b1c7d8ad16be0e1cb3ab99b1508f986cef
  1. original/
  2. CleanSpec.mk