Merge "Add BuildId to frame information."
am: 3da5fcbf70

Change-Id: I8168b1d2ae61280423ef6ec6ff598772aaafabd5