Merge "otautil: Android.mk -> Android.bp"
am: 106ca8e93f

Change-Id: I59305515a5d9f9df949bf42135803311f5b355e6