Merge "Disable debug build" into honeycomb