[automerger skipped] Merge "Add extra filegroup for telephony related sources"...
[automerger skipped] Merge "Add extra filegroup for telephony related sources" am: f70c0a84 am: 78f496fd
am: e747c6bb -s ours
am skip reason: change_id I0771603eeaa7c597b730802d2d8d40efcfff827c with SHA1 740f28fe is in history
Change-Id: Id9cc263ec8ed5e6447b92b75f5dbad6f2af40446