Merge "Convert OverlayHostTests to Android.bp" am: 482b636291 am: 621c06bd7d

Change-Id: Ie4a73d64fe50258da98cb5c42958f83357a4eb20