Reconcile with jb-mr1-release - do not merge

Change-Id: Ib7e2e2f580ebb5ce162fc92cf0f161bec2b140fd
tree: 1a75fa5ebb90fb377c0544903e2ceca7712a9806
  1. original/
  2. CleanSpec.mk