remove "// static" comments
am: e606433c10

Change-Id: Id26cb0503988c40ea0932ac671714c262d22a545