am e2b2a02a: am 4fd70373: Merge "Fix bug 3421901 remove 2 functions from public headers in the SDK." into honeycomb

* commit 'e2b2a02a91dc4101a9481b5bb6ba4c56c7a35dd7':
  Fix bug 3421901 remove 2 functions from public headers in the SDK.