Merge "Expose some factories for aidl_test.go" am: cf96a82fbd am: a8c5109aee

Change-Id: Iffd0e9f43455ead2cf6310c4ef4a75b7f3b2ba69