Merge "Convert crashcollector/Android.mk to Android.bp"