Cpp11 errors

Probably should submit this to AOSP,... ≈

Change-Id: I1f42b339ddec1396d5b3fb9ef01b59fe05ad4e49