Merge "Move CtsShimPrebuilt targets to make." am: 0feede9310
am: 804b235761

Change-Id: I0fe8a3ee156eb831dd0eda635fff863e802d2da0