Merge "Make sure all public types are defined regardless of build variants" into oc-dev am: 177cb0be am: 0de06bc7 Change-Id: Ia5983101c4d5fec9c2757b5ac8a45b01ddd216b1