Merge "ojtests: Split out public/boot tests and add device targets"