android: Add support for 1.8 javac and desugar am: 0585c04e49
am: 77b421a85e

Change-Id: I119d6130c4c5330a19ff271a08e8b1ba94beee03