[automerger skipped] Merge "Convert Android.mk to Android.bp for CtsShim*" am: e21cd46d4d am: eb412a3aa1
am: b813ce00e5 -s ours
am skip reason: change_id Ie6e0df9f4f1365b5194e9748b325b421f838c65b with SHA1 fa54812b1f is in history

Change-Id: Idaa7a5a6f98f1c98e648d37032dbeaa5ad8313ee