Merge "Use generated source not jarjar"
am: 1c8037fcd4

Change-Id: Ide079746455f85b65b50ae2727628cf108d51789