Merge "Add buildExternalStorageAndroidObbDirs()." into rvc-dev