[automerger skipped] Merge "Add gson-prebuilt-jar module" am: 296d339ce5  -s ours
am: 9a5b251bcf  -s ours

Change-Id: I5a981f8e4eee1ccda941dd2e245764ec3a9fd587