Merge "Fix style violation according to go/droidcppstyle"