Merge "Add build_id.mk" into androidx-master-dev
tree: da38ed15aba3e4a631c1761f022c1defdaacb982
  1. core/