base

Merge change 6126 into donut

* changes:
  Use 'LOCAL_PATH' instead of 'local_path', so it's easier to see a diff of the two .mk files.