Merge fixes for android-mainline

This should fix builds with clang.

Change-Id: If3cf37d4d3e17db1d907472889ee430d0467fe66
Signed-off-by: Alistair Strachan <astrachan@google.com>
1 file changed