Merge "Fix bugs in BuildFrameFromPcOnly." am: 86f19217fb

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1413714

Change-Id: I808f0f38874075cdc6f3272ad013b22116cc1472