Merge "Remove unnecessary library functions." into honeycomb