Merge changes from topic "unwindstack_clone" into pi-dev
am: 3bac1ffdd0

Change-Id: I1808e87e15e7e9eae3a9f13217f5376bb3f69f5a