Merge "Merge "Remove Make side (system/test-)api-stubs droiddoc targets" am: 3dd075ad1c am: bb85d80ae1  -s ours" into pi-dev-plus-aosp