am e62902c9: Fix http://b/2114936 - Setting LOCAL_SDK_VERSION current still allows internal API references

Merge commit 'e62902c95b3b6f876ffafa5595396b25e7bd2395' into eclair-plus-aosp

* commit 'e62902c95b3b6f876ffafa5595396b25e7bd2395':
  Fix http://b/2114936 - Setting LOCAL_SDK_VERSION current still allows internal API references