Merge "Enable R8 by default"
am: f93deb040d

Change-Id: I908f2b27a311a038f9574ea58b75fcfd0b9c8736