Merge "Enable annotations for framework stubs"