Into jill.version.buildid and jill.version.sha Change-Id: I905a4229d5d3d69b0f8648481d8d63c31a1fe850 (cherry picked from commit 502737f2)