Merge "Updated Android.bp to build fuzzer targets"
am: 02392be07c

Change-Id: Ieb9aa493bfa7e6d4354c5491451b7307ab1cf3d5