Merge "remove unused include subdir line from Android.mk file at leaf directory"