Merge "rootdir: record last build fingerprint" am: 4e8227420e am: e5fa38c731 am: 227b806688
am: 879eace02c

Change-Id: I91d9f11e49ac30906e77ee951178f4185d7cad0a