Minimum changes just to get it to compile as C++, no real cleanup. Change-Id: I8ff3fa35a07cdc9a6a246e79e33581e5d6598833
Test: Presubmit Change-Id: I1a55ce97817ebb3d7a7e97cb7a41ba61cbe878e3