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

Change-Id: Ib93a0b9e66ec7bbc83a930f45c4a79863c68ca88