Merge "Enable annotations for framework stubs" into rvc-dev am: 517edf62c8 am: 3dda766d21 am: a3f065ec19
Change-Id: I7d6e47343ad738d46501fa62937bf3185106af73
This commit is contained in: