Merge "Update for libunwindstack changes."