Merge "cleanup headers for SDK. bug 3421901" into honeycomb