Merge "Remove obsolete Makefile used for host testing" am: bf4f401c83 am: 3494737d24

Original change: https://android-review.googlesource.com/c/platform/system/keymaster/+/1681566

Change-Id: Iad723577fd09ba80fea771e623b28b1e986c522c