Merge "Fix up TODO: c++0x, update cpplint." into dalvik-dev