Merge "Adjust libunwindstack MapInfo API"