Merge "Revert "Enable R8 by default""
am: 5006ee95fc

Change-Id: Id1daece62d540973fb2ba5b127eb8e781d4e9c07