resolve merge conflicts of 8d92561 to oc-mr1-dev

Test: I solemnly swear I tested this conflict resolution.

tests/msgq/1.0/default/Android.bp

+0 −1

Original line number	Diff line number	Diff line
		@@ -17,7 +17,6 @@ cc_library_shared {
		name: "android.hardware.tests.msgq@1.0-impl",
		defaults: ["hidl_defaults"],
		relative_install_path: "hw",
		proprietary: true,
		srcs: [
		"TestMsgQ.cpp",
		"BenchmarkMsgQ.cpp"