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

Change-Id: Ib604fa62c289287d164ee15d0cbc0974488fae2e