Fix dalvik-dev branch cpplint issues

Change-Id: Id5710dd26e8c433887543c867f037532e61731cc
2 files changed