Merge "Add system stubs for API 21."