Also adapt libcutils to the bionic change that was necessary for this. Bug: http://b/35201172 Test: ran tests Change-Id: I72a98b70b03d23e958b46778b505fbd5c86c32ae
Bug: http://b/33926793 Test: visual inspection Change-Id: Ida84c3aaafa5411a9886f8d3d45679fd60ddc00d