Merge "Add progress indicator to Android.mk includes"
am: 353a659a31

Change-Id: Iee11804f88b35c6b6c8da47792dc4568f9862307