Merge "Remove obsolete Android.mk comments"