Merge "Fix USE_D8 in conjunction with USE_D8_BY_DEFAULT"
am: 656c768dd9

Change-Id: Ie88e3a57d1877b92b436659d60143d6adabf766f