Merge "Convert blk_alloc_to_base_fs to Android.bp"