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

Change-Id: I15a726888d1487652e321c24b2c0d4e8ba86107b