Merge "Remove Android.bp subdirs loop." am: a8c16c91cc am: e9ed55ffc6 am: c3084485c4
am: ef78b3c62a

Change-Id: I5f2b87feb905d7ae0d726b01f60a0f69808ef733