Merge "Implement the TargetFile and BuildInfo" am: 9b76970e9a am: 75c4b32e3a
am: 252f3d3392

Change-Id: Ic1ac9fbe30b125271c48d14db60e50b3cc15293b