Merge "Create dummy hidden api files for golem." am: e53f308e54
am: 6fd766c307

Change-Id: Ic9900e8fd0d55dc9a8c276bf0e3bb82e6b7b4908