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

Change-Id: I82c95aa7d16f4705e7119167f1c93de28fc22e41