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

Change-Id: I42ff86a5a0fc7412d85e4a6e0d9b273941f81aad