Merge "Fix GCC 6.3 warnings in aosp/master"
authorTreehugger Robot <treehugger-gerrit@google.com>
Tue, 9 May 2017 18:32:17 +0000 (18:32 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Tue, 9 May 2017 18:32:19 +0000 (18:32 +0000)

Trivial merge