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

Change-Id: I0c7e06fcf672c9ad996d32772f84c3ccb67987d8