Merge "Revert "Updated Android.bp to build fuzzer targets"" am: b42479c15b am: 3994e1090e am: 1a265959ca
am: e31a2590a8

Change-Id: I5ef5b8ae2d37030023506cf32e015b04d7e245d6