Merge "Remove obsolete Android.mk comments"
am: b209e14d36

Change-Id: I07e38ac17b6b973f7d600decb0fb73f2500b9fe6