Merge "Move vold to Android.bp."