Merge "Revert "Create dummy hidden api files for golem."" am: 066532ee57
am: 1a0383e8b4

Change-Id: If15243b85c19991c27920188a835fe699555741a