Merge "Convert wilhelm to Android.bp"
am: d50d3c811f

Change-Id: I780149097c6bb706b1970c1d5cad8b721fa81dd6