Combine main.cpp/main_cpp.cpp. am: bb654e3195 am: dd431c0f80

Change-Id: I75d3249545744298525c019c45b2624a9ea63e98