Merge "Remove Android.bp subdirs loop."