Merge "Enable R8 by default (third attempt)" am: 6f516aef40 am: 54c54f5eb5
am: fd36ce9639

Change-Id: Id2ebfa24b0dda2df3ec0cf43949edacbcc19813d