Android 7.1.0 release 6
Merge "Silence warnings."
am: 2cde259195

* commit '2cde259195a31c270adf9ea5208353c3803a4364':
  Silence warnings.