Merge "Build ComputePipe for trout" into rvc-dev

aosp_trout_common.mk

diff --git a/aosp_trout_common.mk b/aosp_trout_common.mk
index 113e8dd..c4e5b50 100644
--- a/aosp_trout_common.mk
+++ b/aosp_trout_common.mk
@@ -37,3 +37,5 @@
     ${LOCAL_DUMPSTATE_PROPERTIES}
 
 TARGET_BOARD_INFO_FILE ?= device/google/trout/board-info.txt
+
+include packages/services/Car/computepipe/products/computepipe.mk

aosp_trout_x86.mk

diff --git a/aosp_trout_x86.mk b/aosp_trout_x86.mk
index 9c0c432..59fb9d9 100644
--- a/aosp_trout_x86.mk
+++ b/aosp_trout_x86.mk
@@ -18,8 +18,6 @@
 
 include device/google/trout/aosp_trout_common.mk
 
-include packages/services/Car/computepipe/products/computepipe.mk
-
 DEVICE_MANIFEST_FILE += device/google/trout/manifest_x86.xml
 DEVICE_MATRIX_FILE += device/google/trout/compatibility_matrix.xml
 DEVICE_FRAMEWORK_COMPATIBILITY_MATRIX_FILE := device/google/trout/framework_compatibility_matrix.xml