Merge "Disable lld where it fails." am: 0c8eea86f9 am: dd2277a9bd
am: 4d92ca3f65

Change-Id: I5d7a0970bcec57c478e6819bf41dc5db23822d89