Merge "idegen fails to build a correct dependency graph if one of the submodules it identifies lacks an Android.mk file" am: 3b16a02c35
am: 6af21565ac

Change-Id: Ica0fc7c8d2831d1c17e91915ea25539c5f2d6261