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

Change-Id: Idab52d591ab2a59415c9d95faa2327375507bb0d