Merge "stagefright: renaming some variable in ItemTable"