Merge "Remove obsolete Android.mk comments" am: b209e14d36 am: 3bc74869c7
am: 572063ca23

Change-Id: Id906e6e480350673e4fa72dd5f81e4df22ca9f90