Merge "Fix GCC 6.3 warnings in aosp/master"