Merge "Add pre-upload style checker for cpp and java code" am: 6947f8a084 am: 75bf1258d3
am: f17df905e6

Change-Id: Iff565a64c66427ad28de1cd0325353d72fa10e48