Merge "Remove subdirs from Android.bp"