Merge "Revert "Updated Android.bp to build fuzzer targets""