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

Change-Id: I52c4b81db68776f70116c058535807c6ecb29868