Android O MR1 Preview 2 (OPP6.171019.012)
Switch to javac/desugar/dx by default, not jack
am: fec012b975

Change-Id: I5305f2cb1c779af201287ff4f3e5e3b1dd8c8478