tree c70346b74fea20aa8c88527c8c0edce69587e570
parent f1f78fddee50fde8da1dc20480dc40ccf65db090
author Khai Do <zaro0508@gmail.com> 1457397198 -0800
committer Khai Do <zaro0508@gmail.com> 1457397198 -0800

Bring up to date with Gerrit master

Fixed build failures against current Gerrit master.