Merge "Add build_id.mk" into androidx-master-dev