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