Merge "Allow AIDL interfaces in service parsing"
am: b120efd0c3

Change-Id: Ia4f7f7347e770e163b36c3cddd01545071b11159