Merge "Convert Android.mk to Android.bp for CtsShim*" am: e21cd46d4d
am: eb412a3aa1

Change-Id: Ic32aaa08d39448f5e3baed25d574c965c7186d3c