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

* commit 'f8cbf7297bd7e29867154610cbc24fe0dbc168d1':
  cleanup headers for SDK. bug 3421901