Merge "Add new stubs for API 26"