Merge "Don't link telephony stubs against android_system_stubs" into rvc-dev