Merge "rootdir: record last build fingerprint" am: 4e8227420e
am: e5fa38c731

Change-Id: I1bfd0394849fc5b3c54eb951f0e21a49004e6f13