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

Change-Id: I4e611d81664d10acaa7e1cbbdd10b27a72b49a47