Merge "Update build with --device and apex"