Merge "Use prebuild R8 for USE_R8=true"
am: 8639879e60

Change-Id: I0dc51624869f8f417e81872da397f138b7f48881