Merge "Convert blk_alloc_to_base_fs to Android.bp"
am: 85f0171010

Change-Id: I4d4e7aee93f03bc4497d5e3b2a1417df24de672e