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

Change-Id: Iff008651c0d7a920b5cde2193a0b49af2cbb0fb8