Merge "storaged: convert Android.mk to Android.bp"