Merge "Improve consistency of stubs for framework targets" into rvc-dev am: b992b3353b

Change-Id: I2b08bffef91fbdac0b48cf546e1dfd2c1836cf62