backout d74b3403dfe0 for busting android (--werror for unused var) on a CLOSED TREE