Merge "Add metalava-api-stubs targets" into pi-dev