Merge "LayoutLib: fix incorrect indices in one of the 2 native_drawTextRun methods."