Merge "Move CtsShimPrebuilt targets to make." am: 0feede9310 am: 804b235761 am: 61c509f410
am: 9db25ac8c8

Change-Id: Iaa3594c51ebe5e71326aa332677c529b6f75ba67