Merge "Convert hostsidetests/abioverride/Android.mk file to Android.bp"
am: 5ac7cb0f3a

Change-Id: I6c87aa8b7923052dee08c0ab25b3dd721e379840