DESCRIPTION

Fix compiler warnings and errors.

Change-Id: I7bb695915bd35d2567000d04542173937888881a


COMMENTS

author: Natasha Sullivan
date: 2015-04-24 16:09:11.095000000

Uploaded patch set 1.

-------------------------------------
author: Tate Garrett
date: 2015-04-27 07:28:33.953000000

Change has been successfully cherry-picked as aa732ef8eccc8115f81985b2738462c863797e97

-------------------------------------
