Merge "Don't link telephony stubs against android_system_stubs" into rvc-dev am: c333c8e0 am: f1e82fe6 Change-Id: Id3e5838a3ad87115c35561ee3d75bf61005c8301