Merge "Remove Android.bp subdirs loop."
am: a8c16c91cc

Change-Id: I74cd620dee37f7f65b0cef29a38b725afdcaf20e