Merge "Re-implement img npot support in HC." into honeycomb