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

Change-Id: Ica3728b0d3c7571ac22e1a6faa62fefb5c9fc514