Merge "Build same hidden API lists as in pi-dev"