Merge "Add progress indicator to Android.mk includes"