Merge "idegen fails to build a correct dependency graph if one of the submodules it identifies lacks an Android.mk file"