Merge "Remove com.android.apex.cts.shim.v1_prebuilt from shared/device.mk"