Merge "Update Android.mk finder to work with Android.bp files"