Merge "Tabs -> spaces in frameworks/base."