Merge "Convert wilhelm to Android.bp"