am 5510d172: am f8cbf729: Merge "cleanup headers for SDK. bug 3421901" into honeycomb

* commit '5510d1722b8da4fd630a236f0fd3aad0cc4dac0c':
  cleanup headers for SDK. bug 3421901