Reconcile with jb-mr1-release - do not merge

Change-Id: If617740e2f8eafa49d95ea2efb4769d8145b5eec
tree: c68d6fee7dd0393cfe17655687c8fda5548e1311
  1. original/
  2. CleanSpec.mk