Merge "Switch from jack to javac for unbundled builds"
am: 355de0a00d

Change-Id: Ib281dd853420430e4e06fb0144b727e9a029be86