Merge "Remove valgrind workarounds." am: 79d8ecb9fb
am: 2d49cdc7ec

Change-Id: I10a477c88b62c8b7a913fd018de50b90e8106d3e