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

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