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

Change-Id: I7b0b9d99613d7813fe272959269bdbd068a57770