Merge "Revert "Update build with --device and apex""