Merge "Add BuildId to frame information." am: 3da5fcbf70 am: 95b9ea1ddd
am: 36eb80073e

Change-Id: I9805df037b12432d1daa18c1accaa68669f635aa