Merge "Force dx compilation target to java 6."