am c3c7f5fa: (-s ours) am 63bc11ef: DO NOT MERGE. Only have a portable entrypoint in portable builds.

* commit 'c3c7f5fabd5c00eb945d492db4bba1825ad6a6f3':
  DO NOT MERGE. Only have a portable entrypoint in portable builds.