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

Change-Id: I8a219beacfceb8670ed2a0ecc6bb642513170652