Merge "Remove layoutopt; replaced by the more generic "lint" tool."