Merge "gn2bp: Extract aidl srcs and include dirs"