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

Change-Id: Ib99021238a22606e31ee4973f8a4d57a7d6d0298