[automerger skipped] Merge "Improve consistency of stubs for framework...
[automerger skipped] Merge "Improve consistency of stubs for framework targets" into rvc-dev am: b992b335 am: bffe7ce0 -s ours
am skip reason: Change-Id I0ddeb0c1a8764ac64980395eec8d5703ea4eea7e with SHA-1 221fe90c is in history
Change-Id: Ib1cc7ebf3b4bf7566b8639c56233f779c200228f