[automerger skipped] Fix fuzzer template android_device register am: b6a202255d am: dd7e65c353  -s ours am: 3796c55c38  -s ours am: 04c272ab3e  -s ours skipped: 46c3e4b64f am: 6ff35e7dee  -s ours
am: df373829be  -s ours

Change-Id: I8cee86aef45c9f012fb0a88ecb19f68b038f0bd8